Remove automatic conflict resolution for merge from release branch #4362
+6
−29
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.